Skip to content

ci: consolidate format & generate workflows - #485

Merged
sgoudham merged 6 commits into
catppuccin:mainfrom
uncenter:fix-ci-stuff
Jan 31, 2024
Merged

ci: consolidate format & generate workflows#485
sgoudham merged 6 commits into
catppuccin:mainfrom
uncenter:fix-ci-stuff

Conversation

@uncenter

@uncenter uncenter commented Jan 31, 2024

Copy link
Copy Markdown
Member

Fixes the race condition between the two workflows committing to the repository by combining them into one. Requires switching the commit workflow from stefanzweifel/git-auto-commit-action to EndBug/add-and-commit because the former lacks a way to disable pushing the commit immediately.

@uncenter
uncenter marked this pull request as ready for review January 31, 2024 02:17
@uncenter uncenter changed the title ci: replace format & generate with update-files workflow ci: consolidate format & generate workflows Jan 31, 2024

@sgoudham sgoudham left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks fine, guess we won't really know until it's live.

@sgoudham sgoudham left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actually, just caught something. We can remove the if conditions on the add and commit action and move it to the git push step? Since that's what we want to prevent when it's running on a fork.

@uncenter

Copy link
Copy Markdown
Member Author

Right. Shouldn't we move it to be an if statement for the whole job? Just don't run any of it? Why would we do that only on individual steps?

@uncenter

Copy link
Copy Markdown
Member Author

Ah, turns out we don't have the env context in a jobs.<id>.if. Shoot.

@uncenter
uncenter requested a review from sgoudham January 31, 2024 12:40
@sgoudham
sgoudham merged commit 3feeb07 into catppuccin:main Jan 31, 2024
@uncenter
uncenter deleted the fix-ci-stuff branch February 1, 2024 00:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants